Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream, part 3 #192

Merged
merged 233 commits into from
Jul 5, 2023
Merged

Upstream, part 3 #192

merged 233 commits into from
Jul 5, 2023

Conversation

MilenVolf
Copy link
Collaborator

Апстрим, часть 3

  • Контент ветки arumoon-server, при решении немногочисленных конфликтов в ходе мёрджа, был сохранён.

ElectroJr and others added 30 commits June 23, 2023 13:55
@ElectroJr
Try fix even more random mind test failures (space-wizards#17581)
74df2a3
@EmoGarbage404
22 New Cargo Bounties (space-wizards#17582)
476f780
@PJBot
Automatic changelog update
7bb0f36
@JustinTrotter
uranium spears make damage sounds (space-wizards#17575)
12a44bf
@JustinTrotter
make mining drills weldable and have struct damage (space-wizards#17576)
ecf9206
@lzk228
encryption-key-component.ftl locale update (space-wizards#17557)
6bfccca
@FluidRock
Replace flare ammo with incendiary ammo in Zombie bundle (space-wizar…
17254ec 
…ds#17558)
@lzk228
Fix jumpskirt parents (space-wizards#17552)
5e83956
@PJBot
Automatic changelog update
6d52ca1
@Chief-Engineer
add signaler logs (space-wizards#17556)
4bd6f92
@CrigCrag @Chief-Engineer
janitorial trolley speed buff (space-wizards#17524)
9792116 
* Update janitor.yml

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

Co-authored-by: Chief-Engineer <[email protected]>

* Update janitor.yml

friction gaming

* tweak cart friction

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

* comment

---------

Co-authored-by: Chief-Engineer <[email protected]>
@PJBot
Automatic changelog update
62dc357
@EmoGarbage404
node scanner resprite (space-wizards#17609)
bdbd01f
@PJBot
Automatic changelog update
c64cce4
@crazybrain23
Change QM's supervisor to Captain (space-wizards#17605)
032399c 
* QM works for Cap

* Cargo department works for QM
@PJBot
Automatic changelog update
64a5f2e
@lzk228
Remove some dupe prototype components (space-wizards#17551)
5d126d7
@EmoGarbage404
Artifexium (space-wizards#17604)
4890778
@PJB3005
Allow changing alert level delay. (space-wizards#17435)
3e03418
@PJBot
Automatic changelog update
4d493ba
@PJB3005 @metalgearsloth
Clean up PDA event subscriptions. (space-wizards#17434)
f5bd24f 
Co-authored-by: metalgearsloth <[email protected]>
@Nimfar11
Seeds of fly agarics Amanita EMAG (space-wizards#17598)
46e9623
@PJBot
Automatic changelog update
2b7a304
@dakimasu
Issue#15607-Audio/Ambience (space-wizards#17327)
4ae80fb
@EmoGarbage404
fix galaxythistle bounty locale (space-wizards#17594)
694ba69
@ElectroJr
Remove TickerLobbyReadyEvent (space-wizards#17522)
ecae023
@LankLTE
Adds Health Analyzer to Chem PDA (space-wizards#17603)
de07c2b
@PJBot
Automatic changelog update
084cb7b
@0x6273
Hotplate overhaul (space-wizards#17586)
fcb6516 
* Hotplate overhaul

- Beakers are now placed on top of the hotplate instead of itemslot.
- Hotplate LED now only lights up if it's heating something.
- More comments/xmldoc.
- Some other minor tweaks.

* Actually remove the beaker slot
@PJBot
Automatic changelog update
aea3bf9
PJB3005 and others added 26 commits July 1, 2023 19:00
@PJB3005
Fix changelog author names for 0x6273 (space-wizards#17776)
47064ad
@LankLTE
Buff the Cargo Telepad Delay. (space-wizards#17781)
1dadc70
@Arendian
Network bolting for windoors (space-wizards#17775)
bda71dc
@EmoGarbage404
Make singulo artifact effect more rare (space-wizards#17774)
e73e5cc
@LankLTE
DamageOnHit only damages on successful hits. (space-wizards#17758)
82b33bc
@PJBot
Automatic changelog update
6bf6723
@Arendian
Makes shutters close on certain objects (space-wizards#17782)
024c8fb
@PJBot
Automatic changelog update
70d0630
@PJB3005
Publish changelogs via RSS (space-wizards#17788)
7bfc322
@PJB3005
Chmod +x changelog RSS (space-wizards#17789)
b33e930
@eoineoineoin
Fix bugs when updating paper UI (space-wizards#17786)
9194c54
@Slava0135
add immovable rod event (space-wizards#17278)
41cf8cc
@PJBot
Automatic changelog update
b4a89c0
@brainfood1183
Hamlet error on revival fix. (space-wizards#17797)
a0a3738
@PJBot
Automatic changelog update
360ae67
@HerCoyote23
Add secondary prefix for selecting radio channel, '.' (space-wizards#…
2a47302 
…16964)
@PJBot
Automatic changelog update
87eab6e
@EmoGarbage404
add artifact sound effects (space-wizards#17792)
b3063fb
@PJBot
Automatic changelog update
7b739e9
@MilenVolf
Merge remote-tracking branch 'space-station-14/master' into master-ru
120e530
@MilenVolf
Construction guide locale fix
1bb0bd8
@MilenVolf
Update english locale files
60edfab
@MilenVolf
Update russian locale files
8902ca5
@MilenVolf
Upstream localization
b8e2d3a
@AruMoon
Merge pull request #191 from MilenVolf/master-ru
4d00ce4 
Upstream & Localization
@MilenVolf
Merge branch 'master-ru' into Test-merge
6c40375
@AruMoon AruMoon merged commit 4b6020f into Workbench-Team:arumoon-server Jul 5, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Map Changes: Sprites Changes: UI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.